Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for AKS Extensions & Marketplace Offers #4360

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Add support for AKS Extensions & Marketplace Offers #4360

merged 1 commit into from
Jan 24, 2024

Conversation

willie-yao
Copy link
Contributor

@willie-yao willie-yao commented Dec 11, 2023 •
edited
Loading

What type of PR is this?
/kind feature

What this PR does / why we need it:
This PR adds support for AKS Marketplace extensions

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #3513

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Add support for AKS Extensions & Marketplace Offers

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 11, 2023
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 11, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 12, 2023 •
edited
Loading

Codecov Report

Attention: 89 lines in your changes are missing coverage. Please review.

Comparison is base (89b149f) 62.11% compared to head (9c49910) 62.15%.
Report is 58 commits behind head on main.

Files Patch % Lines
api/v1beta1/azuremanagedcontrolplane_webhook.go 49.12% 50 Missing and 8 partials ⚠️
azure/services/aksextensions/spec.go 58.18% 21 Missing and 2 partials ⚠️
azure/services/aksextensions/aksextensions.go 0.00% 8 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4360      +/-   ##
==========================================
+ Coverage   62.11%   62.15%   +0.03%     
==========================================
  Files         189      191       +2     
  Lines       18642    18849     +207     
==========================================
+ Hits        11580    11715     +135     
- Misses       6425     6484      +59     
- Partials      637      650      +13

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Jont828
Copy link
Contributor

Jont828 commented Dec 12, 2023

/assign

Jont828
Jont828 reviewed Dec 12, 2023
View reviewed changes
Copy link
Contributor

@Jont828 Jont828 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, this is looking good so far!

Tiltfile Outdated Show resolved Hide resolved
api/v1beta1/azuremanagedcontrolplane_webhook.go Outdated Show resolved Hide resolved
api/v1beta1/azuremanagedcontrolplane_webhook_test.go Show resolved Hide resolved
azure/scope/managedcontrolplane.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2023
@dtzar dtzar added this to the v1.13 milestone Dec 14, 2023
@mboersma mboersma assigned mboersma and unassigned mboersma Dec 14, 2023
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 15, 2023
@willie-yao willie-yao changed the title WIP: Add support for AKS Marketplace extensions Add support for AKS Marketplace extensions Jan 11, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 11, 2024
@willie-yao willie-yao force-pushed the aks-marketplace branch 2 times, most recently from 19619a8 to a98549c Compare January 11, 2024 19:01
mboersma
mboersma reviewed Jan 11, 2024
View reviewed changes
api/v1beta1/azuremanagedcontrolplane_types.go Outdated Show resolved Hide resolved
api/v1beta1/azuremanagedcontrolplane_types.go Outdated Show resolved Hide resolved
api/v1beta1/azuremanagedcontrolplane_webhook.go Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
api/v1beta1/types.go Outdated Show resolved Hide resolved
@jackfrancis jackfrancis modified the milestones: v1.13, next Jan 16, 2024
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2024
@willie-yao
Copy link
Contributor Author

Running into the same issue as AKS Fleet with the E2E test not passing on k8s v1.28.3, so I'm also moving this test spec in front of the upgrade test.

Comment on the AKS Fleet PR: #4316 (comment)

@willie-yao
Copy link
Contributor Author

/retest

@mboersma mboersma modified the milestones: next, v1.14 Jan 19, 2024
@nojnhuh
Copy link
Contributor

nojnhuh commented Jan 22, 2024

@Jont828 PTAL

@willie-yao
Copy link
Contributor Author

Just renamed any mentions of "Marketplace" to just "AKS" because you can deploy Azure Extensions as well as those from Marketplace. i.e. these extensions are not exclusive to just Marketplace extensions.

https://learn.microsoft.com/en-us/azure/aks/deploy-extensions-az-cli#create-extension-instance

@willie-yao willie-yao changed the title Add support for AKS Marketplace extensions Add support for AKS Extensions & Marketplace Offers Jan 23, 2024
@willie-yao
Copy link
Contributor Author

/retest

@willie-yao
Copy link
Contributor Author

Looks like pull-cluster-api-provider-azure-windows-custom-builds and pull-cluster-api-provider-azure-windows-with-ci-artifacts are really flaky under this PR. Not sure what could be causing it but I'll look into it. There are flakes on other PRs but they aren't as common.

@jackfrancis
Copy link
Contributor

/retest

@jackfrancis
Copy link
Contributor

/lgtm
/approve

🚀

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 24, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 7209f9d7a3dcf8620fb4e5a1301a359d590651c8

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2024
@nojnhuh
Copy link
Contributor

nojnhuh commented Jan 24, 2024

/hold for squash

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2024
@jackfrancis
Copy link
Contributor

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2024
@k8s-ci-robot k8s-ci-robot merged commit 251516a into kubernetes-sigs:main Jan 24, 2024
29 checks passed
@nojnhuh nojnhuh added the area/managedclusters Issues related to managed AKS clusters created through the CAPZ ManagedCluster Type label Feb 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jont828 Jont828 Jont828 left review comments

@nojnhuh nojnhuh nojnhuh left review comments

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@jackfrancis jackfrancis jackfrancis left review comments

@mboersma mboersma mboersma left review comments

@sonasingh46 sonasingh46 Awaiting requested review from sonasingh46

Assignees

@jackfrancis jackfrancis

@Jont828 Jont828

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/managedclusters Issues related to managed AKS clusters created through the CAPZ ManagedCluster Type cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
CAPZ Planning
Archived in project
Milestone
v1.14
Development

Successfully merging this pull request may close these issues.

Support for AKS Marketplace offers
8 participants
@willie-yao @Jont828 @jackfrancis @nojnhuh @k8s-ci-robot @mboersma @CecileRobertMichon @dtzar